Add ConanVersionRange class and test by johnmhoran · Pull Request #102 · aboutcode-org/univers

johnmhoran · 2023-02-23T15:33:13Z

Fixes:

Add univers support for Conan #101

0.11.1

0.12.0

…mpare (#484)

… against current 0.12.0 server (#498)

0.13.0

* Upload/Download retries + upload errors + wilcard upload * Remove xrange * Py3 exception message removed * Upload url * failing test with order in py3 * Revision memsharded * Not retry when a 404 or other controlled error happen

…error message with remotes

* Fixes sums with pyc and output error with non ascii. Also added messages to retry commands * Removed log * Exclude pyc from packages and manifests * New test, exclude pyc in loads * New test, exclude pyc in loads * Moved retry to uploader_downloader, removed UploadException, changed error message with remotes

…/0.18

0.18.0

* patch, pre, build to Version * patch, pre, build to Version * reverted to default stable() behavior * fixed broken Version() test

0.19.0

0.21.0

0.22.0

* build_requires in recipes * decoupling source folder * tests for local edition and no_copy_sources * fixed broken py3 test * fixed broken py3 test * fixed issue with local package build_folder nested * Ok * Fixed tests * PR: Revision

TG1999

Thanks, few nits for your consideration

TG1999 · 2023-02-24T13:21:30Z

    "nuget": "nuget",
    "pypi": "pypi",
    "packagist": "composer",
+    "conan1": "conan1",


It should be "conan" : "conan1" since gitlab uses conan in their package slug

Thank you @TG1999. I made the change yesterday to conan1 to address an error I was getting when running this test:

pytest -vvs tests/test_version_range.py::test_conan_gitlab_version_range_parse

I just made the change you requested and reran that test, and again I get the same error. Here's an excerpt from a large terminal output:

(venv) Fri Feb 24, 2023 10:00 AM /home/jmh/dev/nexb/univers jmh (101-univers-support-for-conan) $ pytest -vvs tests/test_version_range.py::test_conan_gitlab_version_range_parse [...] =================================================================================================== FAILURES ==================================================================================================== _______________________________________________________________________________ test_conan_gitlab_version_range_parse[test_case0] _______________________________________________________________________________ test_case = {'expected_vers': 'vers:conan1/>=5.1.0|<=5.1.1', 'native': '>=5.1.0 <=5.1.1', 'scheme': 'conan1', 'test_index': 1} @pytest.mark.parametrize("test_case", json.load(open("./tests/data/conan_advisory.json"))) def test_conan_gitlab_version_range_parse(test_case): if test_case["expected_vers"] is None: with pytest.raises(InvalidVersion): Conan1VersionRange.from_native(string=test_case["native"]) return > result = from_gitlab_native( gitlab_scheme=test_case["scheme"], string=test_case["native"], ) tests/test_version_range.py:364: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ gitlab_scheme = 'conan1', string = '>=5.1.0 <=5.1.1' def from_gitlab_native(gitlab_scheme, string): > purl_scheme = PURL_TYPE_BY_GITLAB_SCHEME[gitlab_scheme] E KeyError: 'conan1' src/univers/version_range.py:1106: KeyError [...] ========================================================================================= 427 failed, 1 passed in 8.87s ========================================================================================= (venv) Fri Feb 24, 2023 10:00 AM /home/jmh/dev/nexb/univers jmh (101-univers-support-for-conan) $

I was unable to identify the source of this error -- do you have any suggestions?

Meanwhile, I will implement your other comments and see if that resolves this set of error messages.

TG1999 · 2023-02-24T13:22:36Z

+    {
+        "test_index": 1,
+        "scheme": "conan1",
+        "native": ">=5.1.0 <=5.1.1",


add a parameter "gitlab_scheme" : "conan" in every test here.

@TG1999 Very interesting -- I'm getting a better sense of the structure we need for the gitlab advisory data. I've followed your suggestion and the JSON objects now look like this:

{ "test_index": 1, "scheme": "conan1", "native": ">=5.1.0 <=5.1.1", "expected_vers": "vers:conan1/>=5.1.0|<=5.1.1", "gitlab_scheme": "conan" },

TG1999 · 2023-02-24T13:23:06Z

+            Conan1VersionRange.from_native(string=test_case["native"])
+        return
+    result = from_gitlab_native(
+        gitlab_scheme=test_case["scheme"],


Suggested change

gitlab_scheme=test_case["scheme"],

gitlab_scheme=test_case["gitlab_scheme"],

Outstanding @TG1999 -- with this and the 2 other sets of changes, all 428 of the test cases pass both Conan-related tests.

Thank you. 🙂 Will commit and push shortly.

Reference: #101 Signed-off-by: John M. Horan <johnmhoran@gmail.com>

TG1999

LGTM!

Reference: #101 Signed-off-by: John M. Horan <johnmhoran@gmail.com>

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Signed-off-by: John M. Horan <johnmhoran@gmail.com>

johnmhoran · 2023-03-02T17:09:23Z

In src/univers/version_range.py, there's an s missing in from univers.conan.version_range import VersionRange as conan_verion_range.

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

pombredanne

Don't you need an __init__.py in the conan directory?
I would rather have a regular package than an implicit namespace package.

pombredanne

You are missing the ABOUT and license/notice files

johnmhoran · 2023-03-08T01:06:32Z

@pombredanne @TG1999 I've added an __init__.py file in the /univers/conan/ directory.

johnmhoran · 2023-03-08T01:50:02Z

@pombredanne @TG1999 I've also added a pair of .ABOUT/.NOTICE files for each of errors.py, version_range.py and version.py, and have hand-crafted each of the .ABOUT files. (Should the latter files somehow have been tool-generated?)

Reference: #101 Signed-off-by: John M. Horan <johnmhoran@gmail.com>

johnmhoran · 2023-03-08T02:17:25Z

@pombredanne @TG1999 I just committed and pushed and immediately saw that a GH check has failed --

https://github.com/nexB/univers/pull/102/checks?check_run_id=11840361414

There are 66 commits incorrectly signed off. This means that the author(s) of these commits failed to include a Signed-off-by line in their commit message.

I suspect these sign-off errors are from the commit histories of conan files added from the JFrog repo.

How do we handle this?

johnmhoran · 2023-03-08T04:08:44Z

It's odd that this GH check would have failed after I committed and pushed my limited changes -- the JFrog Conan code had already been added by @TG1999 , and I retrieved it with a git pull. But somehow something I introduced triggered this . . . .

TG1999 · 2023-03-08T04:12:08Z

@johnmhoran thanks for adding the ABOUT files, we cannot do a lot for the DCO failing here because of reusing Conan commit history I have set DCO to pass.

pombredanne

@johnmhoran Thanks... just one last nitpicking to add ABOUT files for the test code (and headers)

Reference: #101 Signed-off-by: John M. Horan <johnmhoran@gmail.com>

pombredanne

LGTM! Thanks!

lasote and others added 30 commits December 1, 2015 14:18

Initial commit

6eacfa1

Python 3 support and CI

c7862b5

Versin compare fix

1d8e4b1

Reverted version check

ab3e41e

Fixed output testing issues and improved version detection

faca806

Merge branch 'release/0.9.0'

190a028

capturing traceback for offending line report

fa1f2a7

Merge branch 'release/0.11.1'

961939a

Merge tag '0.11.1' into develop

9d22c14

0.11.1

Merge branch 'release/0.12.0'

0056863

Merge tag '0.12.0' into develop

65448f9

0.12.0

fixing migrations with no settings.yml. Fixing Version parsing and co…

b2ec8ae

…mpare (#484)

Better version compare in order to allow a 0.12.1-dev0 client operate…

d529ee1

… against current 0.12.0 server (#498)

Merge branch 'release/0.13.0'

9d4d9fd

Merge tag '0.13.0' into develop

705af5c

0.13.0

Feature/better upload (#795)

3467748

* Upload/Download retries + upload errors + wilcard upload * Remove xrange * Py3 exception message removed * Upload url * failing test with order in py3 * Revision memsharded * Not retry when a 404 or other controlled error happen

Moved retry to uploader_downloader, removed UploadException, changed …

43f96b3

…error message with remotes

Merge branch 'release/0.18' of github.com:conan-io/conan into release…

175d4a3

…/0.18

Merge tag '0.18.0' into develop

00c14a3

0.18.0

Feature/improve semver (#927)

d58ef71

* patch, pre, build to Version * patch, pre, build to Version * reverted to default stable() behavior * fixed broken Version() test

Merge branch 'release/0.19.0'

c46f3b4

Merge tag '0.19.0' into develop

f5e5471

0.19.0

added new version modes, fixed string versions (#1108)

c5e05b2

Merge branch 'release/0.21.0'

2395801

Merge tag '0.21.0' into develop

eeb9764

0.21.0

Merge branch 'release/0.22.0'

fb69ace

Merge tag '0.22.0' into develop

6e4ba95

0.22.0

Feature/exception messages (#1301)

628c471

* build_requires in recipes * decoupling source folder * tests for local edition and no_copy_sources * fixed broken py3 test * fixed broken py3 test * fixed issue with local package build_folder nested * Ok * Fixed tests * PR: Revision

Merge branch 'release/0.23.0'

d0c3fdb

TG1999 requested changes Feb 24, 2023

View reviewed changes

Fix 'gitlab_scheme'-related test failures #101

231039b

Reference: #101 Signed-off-by: John M. Horan <johnmhoran@gmail.com>

johnmhoran requested a review from TG1999 February 24, 2023 22:14

TG1999 approved these changes Feb 27, 2023

View reviewed changes

TG1999 requested a review from pombredanne February 27, 2023 11:46

memsharded and others added 7 commits February 27, 2023 18:10

verbose tracebacks (#13226)

f6dda4c

Change references from 'conan1' to 'conan' #101

c3d57ce

Reference: #101 Signed-off-by: John M. Horan <johnmhoran@gmail.com>

Restructure conan version and tests

ad674bf

Reuse conan code from https://github.com/conan-io/conan

d0edd52

Modify imports according to restructured code

308d645

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Fix formatting errors

ce76f0e

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Adjust conan code according to univers #101

2290ed2

Signed-off-by: John M. Horan <johnmhoran@gmail.com>

TG1999 force-pushed the 101-univers-support-for-conan branch from d5b29bb to 9f8c49a Compare March 2, 2023 17:24

Use conan 2.0 as default conan version

48dc602

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

TG1999 force-pushed the 101-univers-support-for-conan branch from 9f8c49a to 48dc602 Compare March 2, 2023 17:27

pombredanne requested changes Mar 2, 2023

View reviewed changes

pombredanne reviewed Mar 2, 2023

View reviewed changes

Comment thread src/univers/conan/errors.py

Add .ABOUT, .NOTICE files #101

1e56074

Reference: #101 Signed-off-by: John M. Horan <johnmhoran@gmail.com>

pombredanne requested changes Mar 8, 2023

View reviewed changes

Comment thread tests/test_conan_version_range.py

Comment thread tests/test_conan_version_comparison.py

Comment thread tests/test_conan_version_bump.py

Add .ABOUT, .NOTICE files for Conan test files #101

01ff53e

Reference: #101 Signed-off-by: John M. Horan <johnmhoran@gmail.com>

pombredanne approved these changes Mar 10, 2023

View reviewed changes

pombredanne merged commit d38d9fd into main Mar 10, 2023

pombredanne deleted the 101-univers-support-for-conan branch March 10, 2023 16:40

	gitlab_scheme=test_case["scheme"],
	gitlab_scheme=test_case["gitlab_scheme"],

Uh oh!

Uh oh!

Conversation

johnmhoran commented Feb 23, 2023 • edited by pombredanne Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TG1999 left a comment

Choose a reason for hiding this comment

Uh oh!

TG1999 Feb 24, 2023

Choose a reason for hiding this comment

Uh oh!

johnmhoran Feb 24, 2023

Choose a reason for hiding this comment

Uh oh!

TG1999 Feb 24, 2023

Choose a reason for hiding this comment

Uh oh!

johnmhoran Feb 24, 2023

Choose a reason for hiding this comment

Uh oh!

TG1999 Feb 24, 2023

Choose a reason for hiding this comment

Uh oh!

johnmhoran Feb 24, 2023

Choose a reason for hiding this comment

Uh oh!

TG1999 left a comment

Choose a reason for hiding this comment

Uh oh!

johnmhoran commented Mar 2, 2023

Uh oh!

pombredanne left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pombredanne left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

johnmhoran commented Mar 8, 2023

Uh oh!

johnmhoran commented Mar 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

johnmhoran commented Mar 8, 2023

Uh oh!

johnmhoran commented Mar 8, 2023

Uh oh!

TG1999 commented Mar 8, 2023

Uh oh!

pombredanne left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pombredanne left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

johnmhoran commented Feb 23, 2023 •

edited by pombredanne

Loading

pombredanne left a comment •

edited

Loading

johnmhoran commented Mar 8, 2023 •

edited

Loading